Merge branch 'whx'

Change-Id: I3fac2645f2464d019c4c7d43efae263b5e1b58a7