Merge "Merge generated greylists into final greylist."
am: aa863ca68e

Change-Id: Ia2686a52c5f53f7a82d6dfb70c5c9cf9430443dd