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

Change-Id: I0a8100a1a6c17cb8f5466ebd11749a271e70a669