am ed91928a: (-s ours) am 60d1ee3e: Better way to disable OTAs for crespo - DO NOT MERGE

Merge commit 'ed91928a6ca817a9a133ee81cfb2e9745acec21d'

* commit 'ed91928a6ca817a9a133ee81cfb2e9745acec21d':
  Better way to disable OTAs for crespo - DO NOT MERGE