Merge proposals dependent on lp:~javier-lopez/ubuntu-nexus7/fix-1177667

lp:~javier-lopez/ubuntu-nexus7/fix-1177667 has no merge proposals.