Merge "Get rid of unnecessary policy file saves" into qt-dev am: ffc7647e57
am: 6b3e3fe087

Change-Id: I853f13a22d9b54f84762d201ee0cd7413b971c94