Forward port AM/PM Style Settings

Change-Id: I6c394e01919b8192481cc7f054cb0e40de2b8200