Change-Id: Ide22c4aa8c56fdd83cb6ce2989eb8c449c55c7c1 Conflicts: docs/html/google/play/billing/index.jd