Merge 7b321aa2c07e84e4d50ec4786c76a2861b1df2fc on remote branch

Change-Id: Icd4325f7503365284acbb11ed4f193808c820c58