Merge remote-tracking branch 'quic/fm.lnx.1.0-rel.1.0' into dev

* quic/fm.lnx.1.0-rel.1.0:

Change-Id: I457247993a3eb226a7c1bf536522d0c2384a452c