Merge "Add boot profile support"
am: 3d901ec513

Change-Id: I37db2f4bd7e6412954d51e914f6e238db5027a6e