Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev am: ec4d649d8f am: f051b28554 am: 5d61a6618b
am: 402176177c

Change-Id: I1a6a0df3694acd7bc47cde041b94f7a1902a25f3