Merge changes from topic "am-4303668227b54beb9c1e82d37d8a8d4c" into oc-dev am: 3216dd21b4 am: 88bfb52c5b
am: f606031659

Change-Id: I63418ea79e06614b6e456c8323b5da7c6099a5e5