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

Change-Id: I092105b03769e3b5f7560d12f19ae3b88de95a7c