Initial Google changes for L

Change-Id: I3ef04aef12ca16920b772824b5b1acd3b7c7d7b7