Merge "Applied comments from review: Change 74622 - Draft"