Merge "Redesign of QSSecurityFooter" into oc-dev am: a017e573b5
am: 457cec0861

Change-Id: Ib0a23d87994e2ded25e3e317771421d410e5dc58