Merge changes from topic "am-a79c39cd13fd4c62b75e3035afb8585c" into oc-dev am: 0c1bc6b5f2 am: 87aa9543e6
am: 86b96c128e

Change-Id: Ia3d6d0cd24ddb4b4fed3436676f3a8a907ac2591