am bea6b4d1: am bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs automerge: 9566bd2

* commit 'bea6b4d12106e2a918274ffccd6e370f48654979':