8ed3b437b1
This was supposed to go in the last CL but I forgot to commit... Bug: 132455160 Change-Id: Ieb66b1f256d7b14c84bbd4d10af1aa8b073d5ac3