Preparation for "browse directory" functionality  (#13099).

Change-Id: I97a5546820cc181717d6aca4b9327d0041623771