Revert "temp patch for extensions/ZeroRatedMobileAccess"

This reverts commit 63ee302310b3afeefe05db6f51c726e88358e3ac

Change-Id: I6c8d3912bcc76fcf4312f9f505916d541f909f1e