am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."

* commit 'a5df326138cdaf4874026c09e2967d8142eca811':