Follow up to I15baa5b1d19324521070d641ae6a227d782a4e9e

Bug: 19003093
Change-Id: I0e1dddb57e347c81d01abb7025144fadf6e53fe4
4 files changed