bump(build-25): Sync with current master

Change-Id: I30215222f7fd88fa990234a8cf0ac615f146c96d