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

Change-Id: If3e76e14e60573d8f2e188abd95e3ef634eda3a2