Change-Id: I4a18462429c662d3377f48f8b0c9c669159bea63
This was made from scratch, for a general cleanup of unused policies and update to M guidelines Change-Id: Id4acda2b384d28b5ca51b3ef0f6e93b648c8e79d