
Some important bugfixes landed since the original merge-shade branch was cut. This merges them in. Change-Id: Id114783678ded5fac1ece405a22f1eab467273c8
Some important bugfixes landed since the original merge-shade branch was cut. This merges them in. Change-Id: Id114783678ded5fac1ece405a22f1eab467273c8