[automerger skipped] Merge "API review: change to use getter to access a...
[automerger skipped] Merge "API review: change to use getter to access a field" am: 2af9edd0 am: e0f5196a -s ours am: dfca204d -s ours
am skip reason: Change-Id I6d5be90eafceb2ce0220cd5fc8b86cc20e407999 with SHA-1 06f9bbb5 is in history
Change-Id: Iff0323fe64ab54bcdd1c096e953710e261b22b72