Standardize and replace assets with vectors
am: bd9ef3c606

Change-Id: I5640f8472462c37b7a0bc16d425d96bbf31169d0