Revert "Update master for stable/stein"

This reverts commit 27fdf563f0a8e5d3686b1cde087520ee4bb40772.

Change-Id: Id62e27156aefbac98a0eac27fa0fbdc55a21b138
2 files changed