Change-Id: I60686d0066a1aa099a7dffbca091c9a7e2bac7f8
This adds back support for 845 and 710 This reverts commit 033dcb081f233962f9a549910ffb796c943720c7. Change-Id: I4198a69889b3b1bf6f352cc0a4e579cee2c633ac