Merge changes from topic "runtime-ld-configs"
am: d35c4ccc40

Change-Id: Ia2c3f76a24009b1857840203a02a912614472911