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

* commit '976aaf1eba41606ddc2fffe789fd5f143f562da2':
  Fix error in the limited mode for ITS