Merge "Code formatting change for upcoming annotations." am: 5d669f79f2 am: 5d44cf6f72
am: 37030d9884

Change-Id: I3526cd00cffc1e4857cfda9bab32b0f1a130d55c