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

Change-Id: Ide9e0d33695a489d8c8b74714feff90c13fb7ec7