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

Change-Id: I5428442540d71d85ff963f677eff50e3e5f83094