Merge cb500c6746ced1f21d047b47467331e57c136a34 on remote branch

Change-Id: I6ec87eff9c218f3d02ff63778609be6bc1d7283b