Merge "Import final sdk version 30 from build 6446812" into rvc-dev am: 2e57ad872e

Change-Id: I7f65f0d42936bff245957aa8536ff804a46c26b6