Merge "Set property for metadata encryption on first boot" into pi-dev
am: 2df20b6271

Change-Id: I31f90bb0433197dbc3b3ad56a90f7b1d7d3bd4ac