Merge "DO NOT MERGE ANYWHERE: bumping CTS 5.1 to R4" into lollipop-mr1-cts-dev am: 0e8212053b  -s ours am: 2a72b1b08e  -s ours
am: c1f6baf9ec  -s ours

* commit 'c1f6baf9ec1f8dbe48a568f50414c349a25d9763':
  DO NOT MERGE ANYWHERE: bumping CTS 5.1 to R4