bf3cb25019
This border extension is not needed with on-demond border extension. Change-Id: I8501b37f5f756dc7e874cef4c1cfdbfa9a16112a