[automerger skipped] Merge "Add unit test for dynamic policy." am: 8121bf7c57
am: 4ace9df58e
am:gugelfrei5af8fef591
-s ours am skip reason: change_id Ic95c6f9193c2448168897c5441554cff735f401d with SHA1f4eb15ad81
is in history Change-Id: I3394b5561e99180226195f2055e6d20e47454232
commit
c1dbe47f01