am 35658cc4: am 4a7873f1:     [FM]Fix  FM App record fail Buganizer ID: 17975676
automerge: 8659bf1

* commit '8659bf1929ee2cc4b3c7fd8eaa43825b6d069fb1':
  [FM]Fix  FM App record fail Buganizer ID: 17975676