[automerger skipped] Merge changes from topic "clean" am: 9f2362bb82
am: fdad4c89fb  -s ours

Change-Id: If0c0f3bfdc0793d07ded76a4d01fec0d439b939e