Merge changes from topics 'bug_62802026_take_2', 'bug_62802026' into oc-dev
am: 4f7fd183eb

Change-Id: I602abd84f82abe6b61f2efc2be4a5c36e644be36