Merge "Switch *_METHOD to a more future-proof pattern." am: f3147f209c am: a786d0becd am: 977bbeed3e
am: 8dc28c3e8d

Change-Id: I888f2d4a06a3016aff46d94682622cdba4d23d1f