Merge changes from topic "am-075f69afbbda4610b4adfcdcb0fd78fc" into oc-dev am: 8e5ec12799 am: b6eed228bc
am: 557941309a

Change-Id: Ie1f3b458f779c0fe2e1d4bcd98079c5d7d0de254