Merge "*** Reason for rollback ***"
am: 1d18e69c85

Change-Id: I19766bea103778f6502c3176d5460bd3ffa61eda