Merge "Fix a bug that may cause the ota generation fail." am: 54f24641bc am: e3d4db13a7

Original change: https://android-review.googlesource.com/c/platform/development/+/1801907

Change-Id: I40e960906f9bfc241c479fd3c2121c6845364e55