Merge "Fix the default BandwidthAmplitudeMap contant" into tm-dev