Merge "app: aboot: Change for adding frp partition support"