Merge 8ecd6c1796884b5e93dc697205a02aa91be7cfac on remote branch

Change-Id: Ic2b9bb952b36b518b994ed11705912284ce35f90