Update for cfx

Change-Id: I9793c07511361bea75c693df29c7825462bdcfde