Merge changes from topic "uevent" am: 28e09852bf am: a111a5b56c
am: b6d2b3b608

Change-Id: I61eb402fbcf3def6986f51707efc6e87e444c86e