Merge commit '611078906ce7ff538f7fbc9618ef8054665d0624' * commit '611078906ce7ff538f7fbc9618ef8054665d0624': Fix http://b/2139600 (expander indicators misaligned).
Merge commit '611078906ce7ff538f7fbc9618ef8054665d0624' * commit '611078906ce7ff538f7fbc9618ef8054665d0624': Fix http://b/2139600 (expander indicators misaligned).