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

Change-Id: I2026742053efc2cc85e8aead2c96fa5db3199719