* commit '0b7d7f53a958132eb539fc81130423878c2db650': cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e
* commit '0b7d7f53a958132eb539fc81130423878c2db650': cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739e