Merge "Remove use of npic image for gtests." am: 69ed58348a
am: 4f89de8111

Change-Id: Id03ad44287596565d0aac53b4392cd131618d146