Merge \"Prevent early boot crash reading PowerProfile\" into nyc-dev
am: ec6db57ac7

Change-Id: Id0327572c549eff30dfe0a8fd70007bcaccf7a32