Merge changes from topic "multithreaded-header-linker-ir" am: 6a233fe18a
am: 5333844442

Change-Id: I1e9e2d70ad91593200d6accc4a037549e0c24c18