Merge 9577207389fedb78b3efb026c3f0f0bf69aa2753 on remote branch

Change-Id: I4e246ff1eb7bd51ef0301fd241fd913ce8c0a65f