Merge changes from topic "am-57ff3c6c-928c-4343-8f69-bf91275badd7" into oc-dev am: 471fa8ae6b am: 7d874e1c69
am: 42828e0983

Change-Id: Ic130335523405d11ce234f957c201bd59d2a5617