Fix Permission fields bug

Change-Id: I9b0d0bf11889e07e4a3274607cf6541cf0a080a5