Merge changes from topic "uevent"
am: 28e09852bf

Change-Id: Ibd9e6abb00d64dcc0c8831c6326a98f942b12d48