Whitespace changes.

Change-Id: I0a7b934b482897f9ab2f38efa7b388c9cd651cbd
Use Person class instead of User class.

Change-Id: I3698503c8ab887e5d02114b4e28a8dfa7be5441c