am dbbf431b: am d0f7f418: Merge "Freeing frame map"

* commit 'dbbf431b289bb7a01b43db3412ecab00abe18362':
  Freeing frame map