Merge "Fixed a race when slot-to-sub mapping table is rebuilding"
am: 5023de5122  -s ours

Change-Id: I97e09286db71906d0016ba2eff24957cca415032