Merge changes from topic "fastboot_fetch" am: 4bf547af43 am: a3082865c4

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1622110

Change-Id: I8cc88d55961f77c818dec1629a83dbef294d3f8e