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