Merge 58c6893912676e85892faa086dbc5ef1180217f0 on remote branch

Change-Id: I4e9abc9f58efcc9108a4b3c2c935b1cdb761ff1b