Merge changes from topics 'bug_62802026_take_2', 'bug_62802026' into oc-dev am: 4f7fd183 am: a4d103d4 am: a59df21e Change-Id: Ie64629297c772da85bca10e74eed11a693945da2