Merge 26e29974ac3464debba03fe61800ca243945c6a3 on remote branch

Change-Id: I9e1b6b95a297bba2a8d2655c385ae5bcbfda9544