[automerger skipped] Merge "refactor dataFailCause" am: 9371864133 am: ab7ada8060
am: 9a8b822096  -s ours

Change-Id: Ib205e2a46d4c900b4d498773ff30bb0d7e4c46c1