Merge "Harmony: Suppress DeadException warnings"
am: 6004d10aa1

Change-Id: Ica7a37562b7bd016debe7aff1b040b61b73d8799