Make strings.xml and cm_strings.xml same as upstream so as to avoid conflicts...

    <!--  Permissions -->

    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_fakePackageSignature">Spoof package signature</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_fakePackageSignature">Allows the app to pretend to be a different app. Malicious applications might be able to use this to access private application data. Legitimate uses include an emulator pretending to be what it emulates. Grant this permission with caution only!</string>

    <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permgrouplab_fake_package_signature">Spoof package signature</string>

    <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permgroupdesc_fake_package_signature">allow to spoof package signature</string>

    <!-- Message shown to the user when the apps requests permission from this group. If ever possible this should stay below 80 characters (assuming the parameters takes 20 characters). Don't abbreviate until the message reaches 120 characters though. [CHAR LIMIT=120] -->

    <string name="permgrouprequest_fake_package_signature">Allow

        &lt;b><xliff:g id="app_name" example="Gmail">%1$s</xliff:g>&lt;/b> to spoof package signature?</string>

    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_statusBar">disable or modify status bar</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <!-- Message shown during acquisition when the sensor is dirty [CHAR LIMIT=100] -->

    <string name="face_acquired_sensor_dirty">Clean the top of your screen, including the black bar</string>

    <!-- Message shown during acquisition when dark glasses were detected [CHAR LIMIT=75] -->

    <string name="face_acquired_dark_glasses_detected" translatable="false">@string/face_acquired_dark_glasses_detected_alt</string>

    <string name="face_acquired_dark_glasses_detected">@string/face_acquired_dark_glasses_detected_alt</string>

    <!-- Message shown during acquisition when a mouth covering was detected [CHAR LIMIT=75] -->

    <string name="face_acquired_mouth_covering_detected" translatable="false">@string/face_acquired_mouth_covering_detected_alt</string>

    <string name="face_acquired_mouth_covering_detected">@string/face_acquired_mouth_covering_detected_alt</string>

    <!-- Message shown during face acquisition when the sensor needs to be recalibrated [CHAR LIMIT=75] -->

    <string name="face_acquired_recalibrate_alt">Can\u2019t create your face model. Try again.</string>