Fix build errors created by the last merge

Change-Id: I46d1c2093bc64c5c8c2230c65ec624544bb37682