Makes inference efficient. am: 6bb39a8ec5
am: 49574bd039

Change-Id: I4085bf36469571115a0566024cfe8e9a98b603ba