Merge changes from topic "am-c310f9b4-18a7-4504-8179-49be1ab1d4a7" into oc-mr1-dev am: 6dc35f01c5
am: 063092d5dd

Change-Id: Ife80d20b7e1bc3ceac6f56f8c0834cf8eb0ed218