Merge remote-tracking branch 'aosp/android-4.9-q' into int/11/fp3

Linux 4.9.302

Change-Id: Ib73e0f0665ec986ac4e6d6be8313d10e9dddb955