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

Change-Id: Ib3bb2c7ec066e0660d68d8bbb4a8a35663aaf7dc