[automerger skipped] Schematize ADB system properties am: e9cd3eda am: 9ba57d4b
am: 3decef00 -s ours
am skip reason: change_id Ic88ac4eb5449355e8bc74e3e505801299db5b8aa with SHA1 bef4eadd is in history
Change-Id: I13ca250867ba326c62e03b90c8e8761a52aa0181