c3ff72f5bd
(cherry-pick of 47a0539ecaf7d7a15008704bd89f748aebf85d47.) Conflicts: core/res/res/values/public.xml Bug: 6811501 Change-Id: Ifb2e030a9fda85a7f664feac812b63e67780e68f