Merge "Light mk -> bp."
am: aaa995113e

Change-Id: Ida7a2f60db6de8e55ba420b43b2bb5dceb5a9cd7