Fix bad cherry-pick merge

Change-Id: Ifbc56d9ef642af4581eee5dd8bb112c0c2d7b7cd