They were removed in commit 18f41dfaf1 by mistake. Change-Id: I0ed17471cd9d6ef19d401210ed530dab93c47865
18f41dfaf1