Merge "DO NOT MERGE OC-MR1 is REL" into oc-mr1-dev
am: 418b291486

Change-Id: Idfe46f6fb6b1aedae5a42445cd196204303c199b