Merge 7888701519c755d88bbb1bb7b072e3e375c16493 on remote branch

Change-Id: I5c462aecbb6d64e0623f12d152ef6634c4417249