AI 145778: Manual merge changes 145382-145384 from cupcake.

Automated import of CL 145778
4 files changed
tree: f4c79910b71660430cff4be0b6fe0b21d426a718
  1. policy/