Merge changes from topic "am-646cf556-d36a-48f1-a414-3797586a8a96" into oc-dev am: ea5a5f49cc am: 5897727afc
am: 8993fe413b

Change-Id: I05a5acac4a59d51d8a76abbde75f69a76f8acac2