Merge "Fix a derp" into nyc-dev
am: 4a73544

* commit '4a735441e82207e18036be09d0d02c855930938f':
  Fix a derp

Change-Id: I1975a6ed121ad0ddfc12784c45092c8af3823bdf