Bug: 241172570 Test: boot Change-Id: I5c3e86c81bd249bb162b8008d10863e299dce943 Merged-Id: I5c3e86c81bd249bb162b8008d10863e299dce943 Signed-off-by: Jack Wu <wjack@google.com>