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

Change-Id: If8896dd2ced6896e511e78f931d291110ac6b9ad