Merge 4f7589a313168b3aecc62e41b7ac858d33b4570a on remote branch

Change-Id: I4a039f792d884b774da804618c18d13c3636bc07