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

Change-Id: I702a8f089fbac5a2ec86391f1f1c7a7bffbddd15