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

Change-Id: I62bfbff32c8f2011f8b711937d39c45be334b5de