Merge "Whitelists ephemeral actions for P" into pi-dev
am: ee34fa9148

Change-Id: Ia713e45f0bdcd23c793bca113c6e740410f61eb3