Add missing change from merge

Change-Id: Idc71aae3d5b238f017cbc027afc1ad9b6a5b531b