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

* commit '3a5841286c49d8944cee9e621fc971948c3f2cf3':
  Fix build breakage due to extraneous dereference