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

Change-Id: Id2307673c82a0fcaf4dee53aa880de61137f3e02