am 96061a70: (-s ours) am d78b9f7d: Merge "Fixing unused private field error"

* commit '96061a701db72a031aa899a71b1730ce598e9a28':
  Fixing unused private field error