Avoid unused private field errors

Change-Id: I09fd613a8e6ed8283faebeb802cc30c57ac8d37b