Merge "Remove comments to avoid merge conflict from aosp"