Merge changes from topic "vintf_object_recovery_mount"
am: 3fff9fbe00

Change-Id: I5a638893657ec0c2177f7bfc99e486803875f23a