Merge "Merge "DO NOT MERGE ANYWHERE: Bump CTS 5.1 to R7" into lollipop-mr1-cts-dev am: 0d37ebf  -s ours" into marshmallow-cts-dev am: ee5f83a  -s ours am: ed16127  -s ours am: 9e9a9cf  -s ours am: 0b06695  -s ours
am: b4fcde1  -s ours

* commit 'b4fcde1ba64f753d6f44b1301324fc315688c52f':
  DO NOT MERGE ANYWHERE: Bump CTS 5.1 to R7

Change-Id: Ia917f446d7f85efa98450781a795103d2e53e5ff