am d4ee2de1: (-s ours) am ad3cf5f8: Restore OTA for crespo. [DO NOT MERGE]

Merge commit 'd4ee2de1c3b5163926d40879277e6e35ea40924c'

* commit 'd4ee2de1c3b5163926d40879277e6e35ea40924c':
  Restore OTA for crespo. [DO NOT MERGE]