Merge "Light mk -> bp." am: aaa995113e am: c25e76d8ab
am: 886207933c  -s ours

Change-Id: I5f560ccdce8fd91ce8e167211cf0615454965fb7