Merge "Fix shadow-field warnings."
am: d08b18d1bb

Change-Id: I7b18e307a6e162d582cc42208b60269bf4fe524e