Merge "Automatic mk -> bp."
am: e5fd969f19

Change-Id: I1343aae4bbf351d30fad7d363c5a7ebfe1763eaf