Merge "Add c/a/i/u/* to the list of injar filters" am: 9198da8c21
am: 23eb5019bc

Change-Id: I0b26fedd90ae646d247a6b93fac92f28ec8c4b9b