am 60d1ee3e: Better way to disable OTAs for crespo - DO NOT MERGE

Merge commit '60d1ee3e539e02ba701b9ff647fd23aca18f890d' into gingerbread-plus-aosp

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