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

Change-Id: I88a31aad238ec5ca67b816cb6deb4e5f311536e1