Merge "Revert "Greylist methods with varargs and intrinsics"" into pi-dev am: 5ca4d29089
am: eaa0bb2c7f

Change-Id: I0912d53b13ab32832c28a7fbb06a461f3768a610