Release note mentiones removal of the option in master branch. Change-Id: I5a9221ce7072eaab5a419f4b0f7d668cdb000921