Merge 5.3-rc3 into android-mainline

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I1f0fb3deeb086ca6f4f362f298c01cb13b3d9c2b