Merge "crash_dump: populate uid field." am: fc9ad309ca
am: a124b20fef

Change-Id: I20a24ddb1315a3e6c3e175a32c26ac81eaae7330