Merge "Framework: Remove some methods from boot image profile"