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

Linux 4.9.301

Change-Id: I9e68a750329b9b96296a03ed770fc894d95332cb