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

Change-Id: I25f1aad9e04c22e0cd4ffc848a53c30dd740bdac