Broke sdk build. Investigating. This reverts commit 4515a674. Change-Id: I6c1107ab626758570a59dc6bf3e4228c70a57196