Merge "Add comments to "public.libraries.*.txt"." am: e7b8fc22af
am: 601e5ac55b

Change-Id: I17f4d394ba671463d195a8a785a96c3b4502e1da