Merge "libui removing diagnostic" am: cfeafaa02c

Change-Id: Id0dabe2122dcb1d1a26d9bcbbf0bee97d7a1d6d4