Snap for 10453563 from 29db264f27140fd954fb6b37c51da411c840610a to mainline-documentsui-release

Change-Id: I447912efb523ab7801fac13901f4639e4ec575ed