Merge changes from topic "am-da3e9584-98c5-4975-8207-a77d2301579a" into oc-dev am: bd9caf4c6f
am: 2b605d89b9

Change-Id: I1686e2207e5764167e1e75fcbf4d0be08bf4590d