Merge "Adding missed incompatibilities due to metalava bug"