Merge "Do not cache the method name from PrettyMethod." am: 8f320f5211
am: 48c314bcb7

Change-Id: I35ebe29fa221aa182c438a237d11b8c5384b8bb0