Merge "Address code review comments"