Merge "Update permissions."
am: c3af747a5d

Change-Id: Id2040e00ae4d37679bf5c37ef4f38c24505302c7