Return footer for 4.0

Change-Id: I0c34e3129a158a58824af340c75cee2b07c13aa7
Merge "Return footer for 4.0"