Squashed cherry-picks from LK

Change-Id: I4b4abaffe0cb459d2bd81dc9daad66c3606f7887