Merge commit '35b406baacaa4821b8b87929cab8d0ff443fe717' into ks-aosp.lnx.12.0.r1-rel

Change-Id: Id43235794fb9d9e898946625db37fb9cf04c5534