Incorporate the latest changes in from shade repo. Change-Id: I823f731b542cce5a3f25e4740f55f18628e2eacd