[automerger skipped] Merge "Use System property to get the slot count" into...
[automerger skipped] Merge "Use System property to get the slot count" into rvc-dev am: 49bab605 am: ad12ec41 -s ours
am skip reason: Change-Id Id0e286aa9327991f13adf36d95dd8a9c5227c53b with SHA-1 09c12dd3 is in history
Change-Id: I6e2085fddf6f48523967a9ef07cc78547551458c