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