acl model changes based on review comments

Change-Id: I908e72b6704a901ae9af138e0e68d0960e519e84