Merge "Add comments to "public.libraries.*.txt"." am: e7b8fc22af am: 601e5ac55b am: 3cdb21a8c7
am: 54f2e52ab5

Change-Id: Id4b155e157da0c18f2cddebf4085366ae2d0afe0