Merge "Fixed the memory leak when receiving Nav messages" into nyc-mr1-dev
am: 9e4733ed33

Change-Id: I8f03a3d36e8836ffc14e9986114b1e3ccb40cc2d