Merge 5785a88195339f631b88ef663375c1201caf9285 on remote branch

Change-Id: I7d10a0562df8f66f300cad150a374d8758b76114