Snap for 10453563 from 8982eba262b52c8300d51876574f8b86951434fa to mainline-documentsui-release

Change-Id: I876d718152c71e007ea892e67d130ee254217826