This is more correct. Bug: 218802673 Test: Compile only Merged-In: Ic477c021529a94b4a3665426b7daaf6567fa311a Change-Id: Ic477c021529a94b4a3665426b7daaf6567fa311a