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

Linux 4.9.312

Change-Id: I31b3b397fa726dab4d111bec05849841a5231c96