am fe2aae76: am a342336c: (-s ours) am ed058349: Merge "Fix bug in FAB action" into mnc-dev

* commit 'fe2aae76576269b42d4a4c9fc92ef25c1ac5efbf':