Merge commit '6d489a5f' into aug10d-oc-dev

Bug: 111085900
Change-Id: I2f224f04d1ae39a64a9c0784fe0c9cab284d88e8