Changes based on Z's review

Change-Id: I1d5b6ba2c157273735ec00fb5685b2d3d7f8a8ca