Merge 11beb87bcf4488e3389bf7ad16c3fece302cd25b on remote branch

Change-Id: Ic656e017c1bde9f99abc903d4f36d556209bfe9b