Merge "DO NOT MERGE Fix security vulnerability in pre-O rild code." into nyc-dev am: f0cbbbcdac am: ab379831bc am: a5eeaef8ee am: 6c6d404fb5 am: 96582369cb  -s ours
am: 7421b551d3

Change-Id: I8499af4e1a16435bf9720ed9a0970b54fd2f0ab5