Merge branch 'whx'

Change-Id: Ibf7cc68621ce43699197ea9684aa5afa6b0fe453