Bug: 19950657 Change-Id: I9999d58e78154ed2d6d824973c40011875de15ef (cherry picked from lmp-mr1-wfc-dev)