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

Change-Id: I9e66651d9ef14a832b12c45a043466a1f9757606