* These have now been moved to the SDK Change-Id: I551ddc8c58ccd7184fddb1c615b15cce8127daad
Change-Id: Ic38bb1acb4d37f90b62679e4420815f49b30fc7f