Patch from device mainatiner: Carlsen Teo Wen Yu

Change-Id: Id77631b5999cff92ba1d466904de8ef156de5c7b