[automerger skipped] fixes a security vulnerability in slice provider am: 46368e4f5c -s ours am: d16ceb6e8e -s ours
am: 122636b4f5 -s ours
am skip reason: change_id Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 with SHA1 2b415a4c44 is in history

Change-Id: I5036fa074195c2294c8b040136bd0a7263ef60d0