Merge "Remove obsolete brillo property"