Merge changes from topic "presubmit-am-a097d19b46714d919133992650772d7d"
* changes:
[automerge] Tighten the scope of ACTION_UDFPS_ILLUMINATE 2p: 78ac57b0 2p: 9df49f5c
[automerge] Tighten the scope of ACTION_UDFPS_ILLUMINATE 2p: 78ac57b0
Tighten the scope of ACTION_UDFPS_ILLUMINATE