fix merge errors

Change-Id: I9a9793990712e8a4d84072d9ffafb09e16360f35