Pulling in dependency changes from //developers/build commit 5d58bc4802 Change-Id: Ie7a807995dc5ffbaa2c0da2cc51795553495196b