Merge 0b5b1cec78c22b11d8752c687395719b0971ac4e on remote branch

Change-Id: Ib18f82c8ce82e80cb570285addc2f03ff1169580