misc: Merge branch hotfix v20.1.0.2 branch into develop

This merge commit also reverts the version info back to
'DEVELOP-FOR-V20.2' for the develop branch.

Change-Id: If6fd326cc23edf2aeaa67353d4d3fed573e9ddd6