am 52951f98: am 39bb0e6b: am 0c6b03d4: am 43b1b930: Merge "Added layout tweaks to handle small screens for CTS Sensor Test." into lollipop-mr1-cts-dev

* commit '52951f989c63b6e8d84f7c9bcefa69db3e4d3b14':
  Added layout tweaks to handle small screens for CTS Sensor Test.