Merge changes from topic "am-0b54e3df-be82-462c-92ce-d33585c1a919" into oc-dev am: 6df61a52f4
am: 0e0c772361

Change-Id: Ia337c1953c2a6d69142aa77e37897e72ddf35cf2