Merge "Allow RecordProto's uid equals to -1"
am: 0f9e4ea735

Change-Id: Id2a772a4aff44013a06733bb88510925ce97991d