Merge "Fix ensure_path_mounted_at for fsck_unshare_blocks" am: a37aa092c7
am: ec6d0626f4

Change-Id: Ie353e86ded08409982b318d430fc6eb0d638c924