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

Change-Id: Icc09020534a0499a9753c03982efc4223592d70e