Merge "Suppress clang 7.0 unused-private-field warnings." am: d3b33b96ca
am: 9376e3a99f

Change-Id: I1f2a1939c1575674c6f452aa157a45767d19c461