aml release es_331820000
Snap for 9850934 from 64a2883aea16195e7aac5ba4525c105de5f37952 to mainline-resolv-release

Change-Id: Ie0a6efa6b061a630700748e6b77a8108611f50a7