Follow-up to commit d16a205acc0f8a8035837ec596e02650768a96a4. Change-Id: Idb8603578f9c1daa2b5de828bb859a734bcca0a8