Merge "Add additional permission check"
am: a58ac65d7d

Change-Id: I75ddd7a422e412a51bb58339a8feb2c06d369dc5