Merge 42a00334da9df6a365a3f51bb9be57c5119fb633 on remote branch

Change-Id: I80b98b37bdf65fec82c81e74b8991271429a0743