shade 2.2

Change-Id: Id738df67f7b4bc9bf50917a100fe3f1b8988bc80