Fixes to support improved external recognizer overlay.

b/17611324

Change-Id: I449fcfdd1ec408e86e6305d4a6fc185af77a4902
3 files changed