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

Change-Id: Id42e740d49987d2a4e92d4c8e1bd39cc7f2c4042