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

Change-Id: I1f83b770991b231473595262ce1189e84c042a5e