Promotion of fm.lnx.2.1-00025.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1110660   I47b9f05f52f4b73b3e609b50984bb6ba9da311e1   Fix static analysis issue

Change-Id: Ib377a1ef729b4708858834a7e3607ab4142e1df0
CRs-Fixed: 1110660