Fixing Tier5/Next Tier Bug.

Change-Id: Iaabeded7bc2962926121ab4abbc639ace15623ee