Fix conflicted files.

Change-Id: I688d2f5467bc7a23eb102bebc4bf5a2c047ca525
8 files changed