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

Change-Id: Iec7b935356ce541e45dbd011f7ce6c14c40368cc