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

Change-Id: Ibaeffbda8f62a8d4c8f1db603dad33bd714dcd9f