Merge "Initialize fs-verity keys in shell script" am: 7f43e9fa40
am: ef787edd24

Change-Id: Id4a6ad1f890e79acfff50c32b57c920f19518bd9