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

Change-Id: Iaeae8f0b96fd472c696099de6743a7b7add11712