Merge changes from topic "am-281eb700-c15a-44d3-a49f-153f9323e62a" into oc-dev am: 231719b4d2
am: 60fb81edda

Change-Id: I5933e96aa34fc6aff073513bdb0400fd02796e62