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

Change-Id: Ifa97ccb8a26ef547871a520a81ebe20820ed5bcc