[dev.link] all: merge branch 'master' into dev.link

Clean merge.

Change-Id: Ia7b2808bc649790198d34c226a61d9e569084dc5