Prepare for 3.30 builds

Change-Id: I88560f9a73a4ff856ea477895e793b30be895d5a
7 files changed