Merge ""Requested dump for tid XXX" message shouldn't be fatal." am: f5d727f221
am: f62f611e01

Change-Id: I7708be47c46ef13808cb01acbd60edde4364f4df