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

Linux 4.9.303

Change-Id: I6a811423f6c0ea0fe21b97a704d8f3f8292f7dc8