Sync FM app with upstream

Change-Id: I7bed8942b447d6965092dae5d50c0c9923d85bca