Merge "Fix 3299611: Use system font for AM/PM indicator" into honeycomb