Merge "Update permissions." am: c3af747a5d
am: b0f149986c

Change-Id: I9baaa5f44fcb67e55fbeec0ca7f965976025ee1a