Merge "Actually change api to use long in CollapsingToolbarLayout." into nyc-dev am: 44e80233cd am: 03745a04cc
am: a2583af056

* commit 'a2583af056faf6f1303370fd974918f9d4bae10a':

Change-Id: I682c965af9723f077792899f948d2a8f5fe90693