Merge tag 'v3.6.1'
am: 600f716d51

Change-Id: I72db06fd0f4d5fe57d2996b31c91c15d6ad22cf6