Merge "Merge changes I54d54f24,I0c384eb3 into oc-mr1-dev am: e332629667 am: 065f4b7ea7"