chore(android): Merge remote-tracking branch 'origin/beta' into fix/android/cloud-catalog-for-local-test
