am 5eeb319b: am 976aaf1e: am f984bc41: am 09016120: Merge "Fix error in the limited mode for ITS" into lollipop-mr1-cts-dev

* commit '5eeb319b6ac32a843da9b50da70bd19a44ab5971':
  Fix error in the limited mode for ITS