am 6216c4ac: (-s ours) am a9f1a9f9: (-s ours) am 705405df: (-s ours) am a3d541b5: (-s ours) Merge "DO NOT MERGE ANYWHERE: bumping cts to 5.1r3" into lollipop-mr1-cts-dev

* commit '6216c4acbbe36b7c14f20ab757948dfe53243211':
  DO NOT MERGE ANYWHERE: bumping cts to 5.1r3