Merge "Use UID as requestID" am: 583f3632e5
am: 6b3afe71fe

Change-Id: I0d9fb770482e72f3b017702ffb7ec144a64462e0