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

Change-Id: Ie2079a1afb29b4fb8d81be98a19a2b9b01e955e7