This reverts commit b12abf0310. Reason for revert: broke sdk build Change-Id: Ib04df196806488245259f797eb9f52e61f337715
b12abf0310