Finder bringup, for the 5-th time

Change-Id: I5dda2818ee5583e9ef661b842e031721e3571d7a
Merge commit '061d4b7' into cm-11.0