Merge "style(measured boot): fix incorrect indentation" into integration