A follow-up to commit cb8cc0ca6544889c07bd8dc6a5b556b71d2f555a. Change-Id: Iae0b27ec33b55bbe50a9417597c528dfed706d2f