Fixing regression in folder positioning.
am: fadbe8ffbd

Change-Id: I1e1a080e5b108e4ecd99aa196167c7dab138f7ec