Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into oc-dev am: d32c2a41 am: 1f5050c0 am: 4fda414e Change-Id: I7c7901f0147f7577240803cc2adc4e189f1994b4