promote es1006 to es2 master

Change-Id: Ice51bf84074268bc890d6f73790d38853a65d160