Merge 80a697968adbbe157998a4ea6efcafdea41b2e48 on remote branch

Change-Id: I406223e05cfde7a73a713bb60c7ee40828528834