Upstream to LK 3.0.101

Change-Id: Ibcc14c0a668ac001865d207fca9daa91a24ec757