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

Change-Id: Ida1886860441245e4b025cd52454ec37ad352513