* commit '3ac71a2258ab95442d3204fd955249d9a0547dbd': Make string consistent with Android writing guidelines