Merge "Remove unused / untested code" am: ec5d60fa82
am: 4e714431df

Change-Id: I6f093919870ab8004167c676640410dc17550f9f