[automerger skipped] Follow up Convert to bp: add scripts targets: cleanup mk am: 39ee8b74b1 -s ours am: a9ae2649c9 -s ours am: fa631f8475 -s ours am: 6bc2c413e3 -s ours
am: 2e00c93370 -s ours
am skip reason: change_id Icbfecefc7b5b21fcc4ab6bdf2a575d8c45e149ee with SHA1 2cc1b41744 is in history

Change-Id: I6994c0d31f81d7bfb1dde464a24f990c9b6f0104