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

Change-Id: Ibaf0f077792ce8511a0f0dbd2ded85c65b705be1