Merge commit '769ed21c33c3629411eb3bbf924de45737a18067' into eclair-plus-aosp * commit '769ed21c33c3629411eb3bbf924de45737a18067': Fix http://b/issue?id=2400423.
Merge commit '769ed21c33c3629411eb3bbf924de45737a18067' into eclair-plus-aosp * commit '769ed21c33c3629411eb3bbf924de45737a18067': Fix http://b/issue?id=2400423.