[automerger skipped] Merge "Move data stall definitions out from Setting" am:...
[automerger skipped] Merge "Move data stall definitions out from Setting" am: e9a39ceb am: 3b4698c3 -s ours
am: 0cf67baa -s ours
am skip reason: change_id I8e1fb5b47fff3bf624131ba1f5732daabd991e6d with SHA1 0b984412 is in history
Change-Id: I7b3a69aa7e610a36c2a7d12116ce40fd21b765f4