Merge commit 'f5e904da' into HEAD
The Android Open Source Project authored
dd1a68b5