Merge branch 'v1.7.5' to aosp/master
am: fe94bf79ec

Change-Id: I917fff769d1a99a189a79d20b68257141b7d6af5