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

Change-Id: I3d05a010fa7eaf3948c597753dec9824518f5c05