Merge "minor change to keep it building"
am: 73cab34d9f

Change-Id: I63a9b21b59b1192065284f9e44071c368c12e641