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

Change-Id: I59107dec864b0676c44476324c6dd0a6f3ee5394