Merge commit '5671d014bc1792a116d374792f8a6cfba2e6f512' into merge-vulkan-1.1.121 am: ffdba7a3a0 am: 637c32456e
am: aa0b831204

Change-Id: I90ac061c35fa274bdd85c9d7e9636a0422240943