[automerger skipped] ART: Conditionally remove loaded-oat-count check am: 3383f9c812 am: 68f1bd4c62
am: 7b980db304 -s ours
am skip reason: change_id I1c12463e905115e858cc0c52711dd82a4f06425d with SHA1 e912955b98 is in history

Change-Id: I679f261a28f3a16b7525b18168d7fe718fb0c922