Merge "NUI favorite logging" am: 3d97f592b5
am: 2423023cc0

Change-Id: If48b55e845f0f728dbd967bbb6c318fe25860bba