Merge "Fix clipping for date and time on QS" am: a5f968806e am: 6cad668a25
am: 8bf5945c3f

Change-Id: Ia811eba9511d385e74668a97db11df3b8d0e9315