Merge changes from topic "vintf_object_recovery_mount" am: 3fff9fbe00 am: 6a26bf3890
am: c5bbc333ec

Change-Id: I022f41cb4e299a8b29ddf3d8438b937b566bd701