Merge "Use UID as requestID"
am: 583f3632e5

Change-Id: Icef3693f5911c8f69076e0990392e28c693cbc22