Merge "Fix access check" am: 87ef739dba
am: 9cbbe2d9df

Change-Id: I988a5e71b02442a7509f9cfc7a1d17aa1b52571d