Merge "Write policy file less" into qt-qpr1-dev
am: a754ff1066

Change-Id: I2c19718c0228a9445c34ca1567db0a2726fb01b4