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

Change-Id: Ica5f0bd21af7630c2bc8c91e1f9879c99899071d