Changes from the upstream review

Change-Id: Icda967a72463d6777b9c791c5e51424312c9889d
Merge remote-tracking branch 'upstream/master'