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

Change-Id: Ia181df5b8d8c80e38b6c8d4b1b8449c9e88a2010