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

Change-Id: I42ce24d3fb71a956f96cbbef2475c6a4d856fe28