Merge "PreloadCheck: Add support for regex checking" am: d46ae2ca5b
am: 69371803d5

Change-Id: I47922d6382b48f5e40182181b204c77e07d39634