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

Change-Id: Ifc8f35efc7a4127b97c201894820ac8825bc3d54