Merge "Address comment from ag/1986215/" into arc-apps