[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 -s ours am: 80a6ff22 -s ours
am skip reason: Change-Id Id0e286aa9327991f13adf36d95dd8a9c5227c53b with SHA-1 4f0acfde is in history
Change-Id: I9cfc57b7493013d494b1f148157ec189a4244131