m159 mergeback#6680

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

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