DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due
to missing CVE

Change-Id: I5688b4a658cef3b0822bfd9fc9ac0631abf6d733
1 file changed