Use replaceable for controller and PASS

Add the usual replaceable for two places where it was missing.

Change-Id: I9c4335475c91350f32d80b6e42ce1639a21bb2b9
Closes-Bug: #1290392
Merge "Use replaceable for controller and PASS"