bad1394c6a
It was commented out in some previous commits. Also correct the region code of America from NA to AM Change-Id: I6cec2560393134de1190291e1f49bc0ac4280af0