Revert^2 "Revert "Add enroll_1_1 with preview window id""

35e8d370fe7b4ecde43bdc919aa6361e81be67f8

Change-Id: I8907905ae929af3ad7b1e66477cec589e4f3f09f
4 files changed