merge fix

Change-Id: I34b0791a2972120598e1110cbfa8051b17da730c