Merge commit \'a5bcc9590a76c2ec0be5a6e8d1db8d8a69d80753\' into mnc-dr2-dev-plus-aosp
am: 951dd8e487

* commit '951dd8e4876fe4cc6691d2aa62f9da9735766eda':
  Fix build breakage due to extraneous dereference