* commit '5e69c0f5569940b5f6a0f9c5a2677639c5ed3062': cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac
* commit '5e69c0f5569940b5f6a0f9c5a2677639c5ed3062': cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186ac