* Fixing all rules will be in subsequent commits Change-Id: If972c22297a7c41b72a9ee7051fad22eb1c44ed9