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

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