am e12a2a47: Merge "Disable CameraServiceTest in a normal build." into kraken