Merge branch 'master-hw-bkpt-fix' into big-LITTLE-MP-master-v16