This helps the removal of vertical availability check. Change-Id: Ie9204e3f2aacd86c8e19f1db0e40949e437a500c