Merge "Use statusToString for status_t print." am: a7a1ddd537
am: 82970a1b8c

Change-Id: If6a2a363dd24b97905bfbd33130310bc7df48102