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

Change-Id: I160511abac26b0efbb00b07dbf6531fc47eb4563