Merge changes If96c0146,I0d68ad60 into oc-dev
am: 5393a0e2d9

Change-Id: Ic70d9eb07b53ccda5fafb8c37177e130d4b279de