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

Change-Id: I12e0f907251c9624ea630c0ce72b42f1a4b45438