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

Change-Id: Ie97064431c6c4b098f8c9e416ae20ef722e6f77c