Merge "cm: Add mini tablet config" into mr1-staging