4c52235fbc
This reverts commit a8a200278dcc232eabd4550f814439c94857c47c. Conflicts: core/res/AndroidManifest.xml core/res/res/values/strings.xml Change-Id: I3f76d93a6ffde031bf82c2afea315ebcdbc179e3