Last kitkat release before L [2/2]

Change-Id: I4dac27700fefb2ecd02f4057d15e49212faa4446
Merge "Last kitkat release before L [2/2]" into du44