Catching up on check ins

Change-Id: I560bdd51c79f27d5f02a955508a666611e0265f0