Fix broken image, and fix build

Change-Id: I0c72764eb7832e1043a9762525f7aaff21a12621