Merge changes from topic "fix-policy"
am: e7194bfdfc

Change-Id: Ib736976b6290e6b03b2f50a13fffcdb95491e7bc