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

Change-Id: Ifd4c7e8ec13d24e5c58f727c9a2e3f1521643e4c