for antilasting fixes

Change-Id: I045a3568061f64289a4dafdbcaa7c2a3ff1b48ce