Merge "Docs: Changes to source.android.com" am: 493114bd93
am: f5f4f53be2

Change-Id: I36a14dc6093cb90fbd9f1d4748a6984d56809c48