This allows users that just want to use the former not to have to include
the later.

Change-Id: I13d282104d9b5dc0c963a756e67bed54f6c6b238
ORIGINAL_AUTHOR=Thai Duong <thaidn@google.com>
GitOrigin-RevId: 78c186af2d9bbf25dd20712e78950f8454eda1dd