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

Change-Id: I7c90804ed55df27244a25fe0e9075c4ec2147e74