Enable use by build system.
am: d334f9abc7

Change-Id: I3dfc3ad20e05eaeedf2cba5f20e2c5c8c1af24fc