Android 4.0 CTS release 1
am 28fc4830: Merge "Cleanup leftover merge conflict"

* commit '28fc4830fdc68db134783955cc9f54f32d35b0fd':
  Cleanup leftover merge conflict