Merge changes from topic "boot-prof-fix"
am: 484845519c

Change-Id: Ie7720b9425ee8fcab1203aa78ee88557a36ba64d