Fix build errors f123k

Change-Id: I835bdafd72c2b415633774737036ed5d3afd03b2