Merge "Some internal clean-up." into arc-apps
am: 3ef1a20c15

Change-Id: I09e5493eb7eedaae352c946385ae5c6a190b19dd