Bug: 142281756 Test: boot Test: manual code inspection Change-Id: I4abf477db7bd46d1daef6f723d4e49f6bfb9bbbe