Merge 3045c8d619b9cf822ede6f06f93481690d163e70 on remote branch

Change-Id: Ia587d910b04cce9f3bfafa8f1c60eba2eef87a9c