Move calls to avoid unnecessary operations

Change-Id: I236f7f75ab9a4511d1b52a6a67299b0e844a103e
1 file changed