Makes inference efficient.
am: 6bb39a8ec5

Change-Id: Iff7868f1f052a2097b209e3f4e31fa5a38f02e55