Merge "Turn off map debug verbose messages" into lmp-mr1-dev