Merge "O MR1 is API 27" into oc-mr1-dev
am: d489d122f4

Change-Id: I7e4e4a710ce874502b1e749a9892e46619a988df