Limit number of stored device properties
am: e8d2b5c0f5

Change-Id: I02e2934b8afc9018ca0036e369a4569f2528f8a9