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

Change-Id: Ie859fee072588a2748810c9f5fc5ec5b2f04b914