[automerger skipped] Cherry-pick security fix for skip_input_data am: 956052dd8b am: d5973796ce -s ours
am skip reason: skipped by user chz

Change-Id: Ib192f88aa7ea7c2d2fc03a7f8ffeb9027507b260