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

Change-Id: I97427d86074cea38ca6aa59264e98a5d81645830