a8d00ff718
... because these were deprecated during the Wallaby cycle[1][2]. [1] 9b050f1a679f1029ed35457db0a5a4810ad56bc5 [2] e57eebdc9721e4ac9274999092a717c02ba79777 Change-Id: I804046b82eb39478a5415ef7d34ed0fdb19b9ab1