m157 mergeback#6562

davidmotson merged 2 commits intomainfirebase/firebase-android-sdk:mainfrom

releases/m157.mergebackfirebase/firebase-android-sdk:releases/m157.mergebackCopy head branch name to clipboard