Merge 2e6f097ad50bae5d597527dff29f8323b706fa79 on remote branch

Change-Id: Id8bbdc3d8bdc86311c579be4b012e38c5ad9bad4