am 13a019fe: (-s ours) am 7daa9132: Disable OTA for crespo [DO NOT MERGE]

Merge commit '13a019fe32e6a0eb3289ad6142173631ac601391'

* commit '13a019fe32e6a0eb3289ad6142173631ac601391':
  Disable OTA for crespo [DO NOT MERGE]