Merge "Check and write some error in atrace."
am: 7b50c02030

Change-Id: I562794bbe7dc52268ad2b477e0dca58a7b79d365