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

Change-Id: Iaf3011a7b2f184660d0f25e93aa4cb0dfd778c85