Merge "Fix unit tests" into nyc-dev
am: 09c900e

* commit '09c900ef10510038772e172f5c3e553a3f0d9366':
  Fix unit tests

Change-Id: Ic63da1b33c6b3c3f1068f4a854fff6eacd5bb465