Merge "Use Buffered reader when loading favorites" into rvc-dev am: 450205e4 am: 478928ab am: 17e40549 Change-Id: Ide9e0d33695a489d8c8b74714feff90c13fb7ec7