Merge "Lint fixes for AppRestrictions sample." into nyc-mr1-dev