Update ZeroRatedMobileAccess to master tip

Change-Id: I9e94327cd9389b75b050d551173f0b268dc2bfad