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

Change-Id: I2a6e199a7521dd4a584aafb21bee5f0cfb86d7ca