Fix old conflict tags, commit ID 87424b653d6ea08c6c3dad87581983c78577ee28

Change-Id: Ia0249abf6b12c7ea4939be04b867fe31eab51dbf