Merge "Check and write some error in atrace." am: 7b50c02030 am: 89c634b6ea am: 651068c908
am: f85aad587b

Change-Id: I6a6a0912f9a1db7bde78fe9ec824cea4656a0677