Merge changes I36636687,I4c45f787 into oc-mr1-dev
am: 54ff7e7582

Change-Id: I6f368c79acfc92c4ed62e7808ae5c744959069c7