Merge "Can disable checkbox without tint on text" into pi-dev
am: 48831c837f

Change-Id: I1a006094735f5d18e7fc8aeb843bac6736613af8