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

Change-Id: I3c22013be3e281c0a94a2e22114009407eb7d2d4