Merge 26e44d2489c67eeecd202c5da3ee17cf68499ed6 on remote branch

Change-Id: Ic317cdcb7a6bf3365d20ee3335836cc52de55edf