DO NOT MERGE: Use correct limit for port values
am: e95300f72d

Change-Id: I8613570cf594489f6eadbbea05def9715b3b135f