Merge "Merge "Hack around b/36066697." into oc-dev am: e139434e3a am: 8effb089ed" into oc-dr1-dev-plus-aosp