Merge "Lint fixes for AppRestrictions sample." into nyc-mr1-dev am: c458c4b1 am: fcaa1853 am: 87921a52 am: a3395589 Change-Id: Ifcf05052b41879cc1de0b85164611c048965628f