am c26b3a7f: am 128dfa51: (-s ours) Merge "DO NOT MERGE" into ics-scoop-plus-aosp

* commit 'c26b3a7f12da9f5d495378749a098811a29daf85':
  DO NOT MERGE