Merge "Use Buffered reader when loading favorites" into rvc-dev am: 450205e4c6 am: 478928abad

Change-Id: Ie9b862b8c7ace1cbd6ed313f7d9c71c4973100a5