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

Change-Id: I2bffcd94ec0562f5fd48fb0c73edfe95e1180fe9