Merge 66011627fba546465b754b64d125fd5b613bcbe9 on remote branch

Change-Id: Ia7798b6b4f6c4ab959e773ea4ff5827d45f8a135