Merge remote-tracking branch 'origin/upstream-v5.2'.

Change-Id: I91f6c8b35024e07301447cf8046b7a7406aa4d16