Find7 bringup - missing commits from cm-12.0

Change-Id: Ie87f2998c7d7de5a135e9d77e45f0217bdab5629