Test: m dist Bug: 278060169 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7c7459a5175d0c18a9721b1c206fc9f1ab88a25a) Merged-In: I040b66d5448b2b4c8276ef1148f4517a3ab3b13a Change-Id: I040b66d5448b2b4c8276ef1148f4517a3ab3b13a