minor bugfix

Change-Id: Id971f6ffb0da838e1849ff1f27697c437fa70b29
stable to AT

Change-Id: I1da130885ed0835f2196cc1e1a8c3f4ee4e46092
Stable to AT

Change-Id: I84d23c7ae8db0140a85d4b48afba24e3f675f119