Merge "Suppress clang 7.0 unused-private-field warnings." am: 3875a153ad
am: 6c3f92ee4b

Change-Id: I3fc0553e0b230b5badb39b02a0c4140c1ad2b992