Merge "Doc change: Adjust security sandbox description." into froyo