Merge 986a49a7f7a37e3667ee729f82a835438781ddda on remote branch

Change-Id: I749ec28914e995d2954b8d56e25ea36ee4665455