Merge "Remove monitor temporarily from sdk builds (try 2)"