Merge "Fix a DocsUI crash..." into arc-apps
am: a341823efc

Change-Id: I556e2b71f2e61907e54e9c82736e276afb88f390