am dbba00b8: (-s ours) Merge "DO NOT MERGE ANYWHERE: Bump CTS 5.1 to R2" into lollipop-mr1-cts-dev

* commit 'dbba00b80eecb615b41cc5728bc69773a2847b38':
  DO NOT MERGE ANYWHERE: Bump CTS 5.1 to R2