Fixes b/5521013 need redlines for folder view Change-Id: I7f589754b92ae19b8ce8d8698ca9bdc9c6167faa
Change-Id: I9d1054056db7b6ac993570adcc4adc4cc6699e9c