8b8914b50d
This reverts commit 432e5f9f167e622d03fee0e10215b6e2234c1a3c. Conflicts: core/res/res/values/public.xml Change-Id: I7212626479da7aef80b9bcb4c2144435364dafae