This is a follow up of I71f58fc49b.

Bug: 9059539
Change-Id: Ibf5684ac196e03e889160d8bb14e2b1377331133