Merge bea7336c54c05ebe65d8e1aa0327df66e01f4981 on remote branch

Change-Id: I3ef4f47b6fcf445650951d2453f393f3a16e47fe