Merge "Decrease transition weight." into nyc-dev
am: 2bbd98c

* commit '2bbd98c8472b76c4f140035eb2392c12ef073ee4':
  Decrease transition weight.

Change-Id: Ieb6f01612484e766b6d925e0aa4641f88d2fe8c5