Merge changes from topic "am-6c55709f-f895-4072-8c00-5133d079d8d8" into oc-dev am: cff099466e
am: 21060a9e0d

Change-Id: I404b2530e16205e480bcb3524c8d070700b15961