Fixes: 159832638 Test: atest --test-mapping apex/blobstore Change-Id: I97d97ec2874ace574d6d64c4793a6b374949725e