reduce upstream diff more

Change-Id: I56a796864bee2659489c0fb03d0443168fe28bef
Merge pull request #155 from awong-dev/tweak2

reduce upstream diff more