am a9c8b178: (-s ours) am 6f8df6a2: (-s ours) am b3afbbe5: (-s ours) am ecad92df: (-s ours) DO NOT MERGE ANYWHERE. update support library from build 1828919.

* commit 'a9c8b1789f81f17511cea1e6951842c6253c13ec':
  DO NOT MERGE ANYWHERE. update support library from build 1828919.