Merge "Fixed all APIs not meeting API review requirement"