Merge 523ee75dfed15d27e0228ddfda708dd06f0d99c7 on remote branch

Change-Id: I1fc6aeba65568ed2bb13231ad632153f4119f45c