These crept in with the earlier merge. Change-Id: I201736c9a3fbfb67753104a2ec6d0683e22250d1 Closes-Bug: 1638479