Merge "Add ATRACEs for Buffer indices"