Merge "Use floats for face enrollment dimensions" am: 59baff6ef9 am: fd493b221a

Change-Id: Ia4ac6e428666fb82f39e6b43620623e141f716c0