Merge "Fix ripple on QS Footer" into oc-dev am: 13af917690
am: 95f37f5edd

Change-Id: I04d11c8e288e284a0a970f2c3618b7a23aaaa7fb