Merge 32be60def31b34302a8e990eb04e0584a90b1b6b on remote branch

Change-Id: I0006bf1e263c90affd1c464d2335707ef1ff3fe8