Merge remote-tracking branch 'origin/atel-sys.lnx.12.0' into HEAD

Change-Id: Ia395c89edd660c9d5cd08d68becb3012938d8847