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

Change-Id: I6952bccb06d8a1e127662d5ff801d89c8d9a6153