Forward port AM/PM Style Settings

Change-Id: I952b363110765e10e694a98cc66857d7f2b3f1cd