Merge remote-tracking branch 'goog/upstream-master'.
am: 1841408827

Change-Id: Ic88cc62565b421fe4fe5e0eba2c65283abfa95d5