Also some cleanup. (cherry picked from commit c991403c) Change-Id: I9c1a8093e6356f1b52e332009429b77fa5c1d448