Merge "Specialize oc-dev into OPR1" into oc-dev
am: b70a93465a

Change-Id: I488e308e863e7ea8ddbfe6f4d1a0588ebec016d5