Merge "[Manual] Remove redundant 'public' modifier"
am: 98613f27b5

Change-Id: Ied826d9fe2388f6694f0aefefd2b6744761a7552