Merge non-SDK @removed API and light greylist
am: 0585533a85

Change-Id: I3b052c65e23b813f96df9a8d28fe81961bf42a7f