Merge "Update fixes based on the latest source code"