Merge "refactor dataFailCause"
am: 9371864133

Change-Id: I95b86281f9e23874a819646f2c90b1609c720e00