Merge "Fix [CatchFail] situation" am: e9eef4fb59

Change-Id: I57d587913899c81625795d3b970cf5a99129f92a