Merge f357352c3f1cfac3cd5b108360760bd0c1d8bc15 on remote branch

Change-Id: Ic5a2e74fa33d97d29be3e39def2e937473053710