Merge "Merge "Storage item preferences should be 72dp tall." into oc-dr1-dev am: 37caf9c7da" into oc-dr1-dev-plus-aosp
am: 5daad21245

Change-Id: I466eee3851df5a7abcf7ab2b310e32b1a2603c03