Merge "Revert "Fix build on older APIs, take 2"" am: ea04c984b4
am: 36f778afb6

Change-Id: Ibbf294910df377546f13810f2251020c119a3c7d