Merge 47aa970586d6ae711f717404c274ee20cbe86bdd on remote branch

Change-Id: If052f126843332eaae97af44bd0b1c267ebc9723