Merge branch 'stable-3.7' into stable-3.8 * stable-3.7: Fix ordering of parameters for apply objects log Change-Id: I569da6f85cadd33905f3baa7eb9136a49c278b7d