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