Change-Id: Ia871ca1f1faf5233783fa3e023cfa90c9044922a
Will need changes when the rest of the device repo is merged. Change-Id: I797e0c803e6f7cad514db5c6ae055aaa47433c7b