Merge changes from topic "linker-config" am: 75cff06f5a
am: dd20c55ba0

Change-Id: I39337d59921aac46236d132dcb1c310a64c7a06d