Merge changes from topic "vintf_object_recovery_mount" am: 82fc6ae5b8
am: cc6eb0ee44

Change-Id: I8cf4a096c15d6ec8fc9239807c1b0fa698c25d36