Merge "Small fixes for AppRestriction samples." into nyc-mr1-dev am: d7d387a2 am: e7cbb91e am: caba58a6 am: 0f87ec3d Change-Id: Id04c4909383e45571fb970f5c43b642a5b1e48f7