Merge commit 'cf6c031ec38f6932125148cdaceb984b07ec5052' into HEAD am: e2e0f82d2c

Original change: https://android-review.googlesource.com/c/platform/external/libbrillo/+/1353562

Change-Id: I9fc110e7621f37f1cafb644b26d0a0f4c5fcbd4e