Merge "DO NOT MERGE Fix security vulnerability in pre-O rild code." into mnc-dev am: e66a47c150 am: 957626f82d am: ddc6f6427e am: 0756964d91  -s ours am: b8484b0fe3 am: e9fe8f02c9 am: 71eb7902d3 am: 77142523ff am: 009637231d  -s ours am: a50308d10b am: 05465f92be
am: 44fa7c92a8

Change-Id: Id671606a1905d96fd1358468fd624c3739fb5377