Merge "Use Buffered reader when loading favorites" into rvc-dev am: 450205e4 am: 478928ab am: a2677f59 am: 04ec969f Change-Id: I902688fcf2e90d2765918e8cd2160cf1fe8126c4