Merge "Add additional permission check" am: a58ac65d7d am: 253b2d18f0
am: 824069b53d

Change-Id: I71480709eef8aac41b4345b39d0838b1f97c66dd