Merge "Fixed nits for directory CL." into arc-apps
am: 310f156077

Change-Id: If37d963ae12ddaea32167fe882c12fe78cd67a37