Merge "Revert "Disabling som attributes so that dependencies can use compat libraries"" into ub-launcher3-burnaby-polish