Merge "Add unit test for dynamic policy."
am: 8121bf7c57

Change-Id: Ibb02ec372f31bdca06f1faa968b32de23c33824c