Merge "Add TEST_MAPPINGs for autofill in Activity path"