am 7e10814c: (-s ours) am 77ee5578: (-s ours) am bcf230fa: (-s ours) am 13dcf4a8: (-s ours) DO NOT MERGE ANYWHERE. update support library from build 1830641

* commit '7e10814cec75c1a3947b0b672431db20e8e57b80':
  DO NOT MERGE ANYWHERE. update support library from build 1830641