Merge 9ec19be6737a6ff4f82196f58d0a9aa87da2d691 on remote branch

Change-Id: I1e2a1469423071219b0f90a31d6abe3a1b6ff526