Merge changes from topic "am-707d9054-0085-4add-8cb5-07f6cb10d135" into oc-dev am: 3fa917c8bc am: 51ec5967af
am: ab66d6295a

Change-Id: I740ca5a23ab06786dc4ac0039c6c52f556f09b2c