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

Change-Id: Ie40cd0fc4ca86da1949f5e39e98d82f4c5d45de7