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

Change-Id: I27b587559bad85c9244216bd3c77de5d5d29f2a4