Merge "Fix build breakage due to extraneous dereference" am: a763da3f1f am: 3a5841286c
am: 476ecb24db

* commit '476ecb24dbf4492e27247be7c81f337d4da2de4c':
  Fix build breakage due to extraneous dereference