am b6f23a6c: am bbe41b55: Merge change I4bd71b0f into eclair

Merge commit 'b6f23a6cbcdf627081b5486e002944af617ecddb' into eclair-mr2-plus-aosp

* commit 'b6f23a6cbcdf627081b5486e002944af617ecddb':
  Fix http://b/issue?id=2203681