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

Change-Id: I76c62539713caefe49acc74c8302631c677ac65b