Merge changes from topic "am-f09a9ecb-36ab-48ad-9891-c5de5d437800" into oc-dev am: 5d63751685 am: f3050cbc4b
am: 6e582b16de

Change-Id: Ia369410b9cc066b68ac47d7143257ca0e41ad716