Merge "Fix build broken by dfce17570e74e94404395a802." am: 512563d6cd
am: ef48bcb2e8

* commit 'ef48bcb2e80b3d9aa93feaf1dd18ce0b7add8355':
  Fix build broken by dfce17570e74e94404395a802.