Merge "Update QS if the content gets stale" into oc-mr1-dev
am: b98eeb2552

Change-Id: I863d105e3a3f36f595cff9f439a77e8e37382dac