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

Change-Id: Icc4ae2bfe20f3d606bb8fc2a7f22fae21d0c92a3