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

Change-Id: I12b381db7ee6c745c49e8dc2016adc03dc622302