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

* commit '516130ccb1841afb6ef154c28269d91594925429':
  Freeing frame map