Merge "Address a few unittest comments." am: 9c3a298748
am: d4d464ae2c

Change-Id: Iacb543c081a89327c66ce849b764866f12bc60d0