Some of the earlier cleanup functions may still refer to some of the options. Change-Id: I5b6db886fe58891b3f737e7a0f3b31b0425699b9 (cherry picked from commit dafd71fd98) (cherry picked from commit 9d486c0514)
dafd71fd98
9d486c0514