serrano: Sync FM app with upstream

Change-Id: I58f7af61d3d3fe13bc9a3a720b1f664a2bf742e1
Merge branch 'cm-11.0' into martincz