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

Change-Id: Ia3cdb44699337c20732ec17c10220b33ff0eadbb