I'll take these as well.

Change-Id: I44173fa061e26d98100a8f268c17952fabb4c8bc