Ummmm, did we forget to clobber something?  lol

Change-Id: I3aa03f5962c5c9abb455edbfb536a6752d6a7009
Merge "Ummmm, did we forget to clobber something?  lol" into jb42