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

Change-Id: I65dc2ec5c33d280192a06b01b9a39621b8f8d840