Merge changes from topic "am-37f5fd31-e121-420d-a199-6bb9d1bbf861" into oc-mr1-dev am: 7e51e860e1
am: 56bb7f7f17

Change-Id: Iec334196b67ffe3412c84db00b13ae868aea3bad