Merge "Harmony: Suppress DeadException warnings" am: 6004d10aa1 am: caa4e01ac1
am: 4f47352fca

Change-Id: I4ba0f35ace60373b1b618e7f855aa01ff73cd79b