Merge "Add UID in bugreport" into oc-dev am: 42f1c7b9cb
am: 0e8a2988b1

Change-Id: I3dcf6cf9060db3e2e4204ffed752d16e61e314d1