am 4a1fd997: Merge "Fix the build break due to ag/567355." into ub-camera-glacier

* commit '4a1fd9976fc47a732058e764c00a36f538ca430c':
  Fix the build break due to ag/567355.