The + operator on dicts is deprecated and will be removed from future version of Bazel. Change-Id: I9f3db02f13c1c56c3afc4cc94b142513f0ae3908 (cherry picked from commit 4c8be85fcfc83582fad77684cff6044e828d4cb6)