[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: e0c175eb -s ours
am skip reason: Change-Id Id0e286aa9327991f13adf36d95dd8a9c5227c53b with SHA-1 09c12dd3 is in history
Change-Id: Id30d042e915015ee0f05adf0f20fbcd50d831689