merge upstream changes

Change-Id: I17658f031ccf53b597ba9ffb10e59a486160b054