am b8796212: resolved conflicts for merge of ceae9983 to honeycomb-plus-aosp

* commit 'b8796212e3544262193960ade01db6cb2023c8f9':
  Fixing self-assignment in cloning code.