Merge "leanback: some javadoc fixes" into mnc-ub-dev