Merge commit 'cf6c031ec38f6932125148cdaceb984b07ec5052' into HEAD am: e2e0f82d2c am: d4ab54f375 am: bb9b65f388 am: b6436bf48e

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

Change-Id: I4b20e56b459fd7de8a98bebeb159445e02d61e9d