Merge "Merge "DropBoxManager: Fix doc build error" into sc-dev am: 019189c3 am: 09b6ee6b" into sc-v2-dev-plus-aosp