am 9d12fdb1: Merge change 26625 into eclair

Merge commit '9d12fdb1b55500d69df5a1bdc2fcba57a2f1876c' into eclair-plus-aosp

* commit '9d12fdb1b55500d69df5a1bdc2fcba57a2f1876c':
  Fix http://b/2139600 (expander indicators misaligned).