Merge commit '6d489a5f' into aug10d-oc-dev
am: 1c7dce84d8

Change-Id: I634f146b629a2fbcf293619337683b59afd4b41a