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

Change-Id: Ie27114211fdea57171b92ad081517f897c8f5c56