Merge "Merge "Use 2.2.0-alpha1" into nyc-dev am: 7cb1ec0ece am: a75df86d10" into nyc-mr1-dev-plus-aosp
am: 524b7b1819

* commit '524b7b1819805aadf588e6743a47c4ee67037e80':

Change-Id: I104b29654a7ca2c3d5ac234e1649cc4b855e068e