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

Change-Id: I37d1d5c616a6a68751a63e05fdf6c0199b0fd671