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