* commit 'e3d0b697ede2295cce7f23dcb2d303c9d3651a50': Make string consistent with Android writing guidelines