Enable use by build system. am: d334f9abc7
am: 62cb45aec7

Change-Id: Ia3cc050fb2c0050e26c2b9f8df27cdfe56ff5a03