Change-Id: Ie1bd0fb52a16277482ce461a50b16550332b6768
Mostly via the @property annotation. This is to make phan a little happier. Change-Id: I3fde33955240dab20870821e9db93caba163845b
Change-Id: I36b26609ccb3f135a22961b32a46cdc06603b3e4