Merge "Add 227dp bucket for Wear Device Support"