Merge "Fix error in the limited mode for ITS" into lollipop-mr1-cts-dev