Simplify access_flags_ updates am: 65a01a7a75 am: 02feb6664d

Change-Id: Ie1c2d908b2cefc9cb9baaf3fb39ceea6d154ae88