Merge "oc-mr1-dev is now 8.1.0" into oc-mr1-dev
am: f01a5ef7c3

Change-Id: I6cb15b97e680448d1d459d9a4dd67b7b520a31a9