Merge "Start using new C++ Fstab class widely"