Merge changes from topic "am-a026fb066f5d4de6b6b8eed401a8d29a" into oc-dev am: 20636372be
am: 3f2f4efdbd

Change-Id: Ia232c42c329843054ad6e7c4ac699ff6126da43a