Merge "Silently ignore empty path elements"
am: bb148b7cee

Change-Id: I356890d7fcdc674a62ae0881718cc318d02fb2bb