Merge "Don't execute code before checking a class is a messagenano." am: 89ebbfb9a9 am: 72070e4cf3
am: 9764ba41a7

Change-Id: Ib26e94738b13fa5040f299117eed839f5a1ef4f5