Merge "Fix [CatchFail] situation" am: e9eef4fb59 am: f25006397e am: ef7f728866 am: 5b2b8a9987

Change-Id: I5f2f61ad05d451270f877e787edf039eb9bdeab3