Additionally: * Begin progress of switching codebase to ES6 Bug: T348807 Change-Id: I22d46f0d0d9f5ace7291f4ddedfc515ef69d0835