* commit '8a8f82bbd606657df8a804b4cd499556e2292404': cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc
* commit '8a8f82bbd606657df8a804b4cd499556e2292404': cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbc