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

Change-Id: I7577d016c182d09d8137d772fbf4900764de9f31