Merge "Use symbolic rather than duplicate string for pass."
am: 8fd5015061

Change-Id: I34050bcbfb2842dd860bbb3d8b4a3ecda2a8c059