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

* commit 'a342336c079de49b583f251728381ea9546d3c17':