Merge "Upgrade to asm 5.2" am: 72294510e6 am: a152a8dbbc
am: 8be2e71341

Change-Id: Ib49e34e019344574848daa447626c79c89916fe1