Merge branch 'whx'

Change-Id: I45b82e910474c4a03357bccd17ae3a02f03ee51b