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

Change-Id: I7f35e67d44748e670363a88690840aa945d9e8e9