Modifications enable use by the build system. am: 88d0f99dee am: fcd3e09426
am: 0f5621ae4b

Change-Id: I30078be3c56bf26b4b082aaca6380f41e3ce4d2d