Merge cb02ef92af24691a44ad69217dd4eed835d409c8 on remote branch

Change-Id: Ic57cae4e8f37617c365db8b9228f74d99feec0d5