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

Change-Id: I99a244cfaa79a2c338a6c75ec1f12b9107420459