Bug: 29859821 Change-Id: Ia6de0de04d74f4f947243f38ac2bd190ae586401 (cherry picked from commit bc6fc60683)
bc6fc60683