am 3fc108ac: am fad7204e: resolved conflicts for merge of 5f5d5c8c to gingerbread

Merge commit '3fc108acf2b05153489730178c85b8db94f603af'

* commit '3fc108acf2b05153489730178c85b8db94f603af':
  validate the source of uevent messages