Merge "Add uid field annotation in atoms.proto and statd memory usage optimization." into pi-dev am: aed0fed078
am: 38063f33f3

Change-Id: I9e5893b7d50fbffd9524991fffcb7498a9dbea7b