Merge "Fix date going missing in QS" into oc-dev am: ff9a2790b7
am: 256a7f3926

Change-Id: If7ed5ed0e153a0887a148fbb28274c7443e1a34f