Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev am: cec93100ea am: 7557661787 am: 199b3ee0d8 am: 6dc57344d6
am: 4fc0ab5d7f

Change-Id: I207cbc6261c814170a1018cf3403df55d7144321