Merge branch 'whx'

Change-Id: I86460a0694489a93dcfe978e90b2175b1c59af0b