Merge "Fixed nits for directory CL." into arc-apps