Merge "fix misleading FATAL EXCEPTION IN SYSTEM PROCESS log" am: c0c9f53175
am: 78d15fd15a

Change-Id: Ie90bccf5aa5fb67e1b4769fcbb1013b1fae71063