Merge 5597c41173bed32424eeae934795328e4911f587 on remote branch

Change-Id: Ic0e22468ccb81f691762c8e5d03054bdb3aee1d3