Merge "Upgrade to 7.7.5" am: 5626a19fd2
am: 17f4fb05d4

Change-Id: I29f465d348c824c0a2b5e15ba3e621aa2506ba06