Merge "libui removing diagnostic" am: cfeafaa02c am: edcf5f9092

Change-Id: I5a732150e876598624ff00be1f36c7c625319a60