Merge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into oc-dev am: 8c5514b186 am: fefdff353f am: bae17b1a99 am: cb69b2f8f9
am: c0c8b5f672

Change-Id: I8992da328b334b9bc9702061cbe2c9a2a830e113