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

Change-Id: I6c963d86c2692d2a5825ed3e29650b3be7cccd3c