Merge 73552211e4b1073493b28b400529fabd356a5c61 on remote branch

Change-Id: If6e1d922a23a67cd0bf8db5d16f5a51935029709