Merge "FastRpc Fix for SDM439 SDM429"