Merge a7d5a7c12d8091a100e761fa0e8909c5fe989c96 on remote branch

Change-Id: Ia9b43e7e127194932561e706fe43b1f470781a70