Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into oc-dev
am: 9d85c1ff53

Change-Id: I96184594285add35eacbac8e61da3120e4ce67a1