Merge "refactor dataFailCause" am: 9371864133
am: ab7ada8060

Change-Id: I33f628f04da1402fe402c5234a78d4cf9d436d00