Merge "Add uid field annotation in atoms.proto and statd memory usage optimization." into pi-dev