Sync FM app with upstream

Change-Id: I01dde9404e542da04f46451b250b88dfeadcba64