Merge "Update message flow for shim-layer architecture"