This helps the removal of horizontal availability check. Change-Id: Ie3b97eea63b4cc79ec78df119c2730a4d7cf539d