Merge changes I7d2b7e50,I784406a6 into oc-dev
am: 76831f7e39

Change-Id: Ia2a30b7b9f4f11afdbf3ee020288a8d29245a4f4