Merge "Fix some edge cases" into nyc-dev am: 4a62eff
am: c01a9b6

* commit 'c01a9b6a9ba2662fafa6f4152ca9986faacd2d66':
  Fix some edge cases

Change-Id: I52d65ed7c5da33b33a4f98953800c1dedea2bf09