This change breaks several gates, including RDO's package promotion. This reverts commit f06ba48195. Change-Id: I0524b7057016daa59ea0a506bdc50a71e9fc8f6a
f06ba48195