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

Change-Id: Ice17d2669ade40e3e95c43684b4bff1ce8b58b44