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

Change-Id: Ia3329fbdaca916062728327317fa595e87ef67ca