Merge upstream for the first time
am: 3798baae63

Change-Id: I88dff63df6e103fe8a285218eec83160db49ef7a