Merge "Fixed the memory leak when receiving Nav messages" into nyc-mr1-dev