Merge "Import platform SDK from build 6493450" into rvc-dev am: aa171ae1b0

Change-Id: I000dcff16d5c35b7f766576468de403572a86738