[automerger skipped] Cleanup trying to move to bp am: 4c9d66e56c  -s ours
am: d5ed0e62a5  -s ours

Change-Id: I8a1e7d5f6f88fffc8c6b72f383e0b132939df6c6