Merge "Greylist methods with varargs and intrinsics" into pi-dev
am: 1eff922e34

Change-Id: I2cf0a3459b3723aa263d5ae6ca4dafe3a589181d