Merge "Merge "Correct some errno values before throw ServiceSpecificException" am: ce0df5a6ed am: 8383f2a1b3 am: 737061a759 am: b310eb1268"