Docs: Removing extra lossless entry and fixing conflict

Bug: 19283199
Change-Id: I0db1b87e8dea569792d867140581a15e56a5efce
1 file changed