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

Change-Id: I4686e307154220b5190262f97b2af97c115d9bbe