Merge changes I3352e1fc,I52ac4dda,Ie9d51041,Id643a27e into nyc-mr1-dev-plus-aosp
am: 4015cdc67a

Change-Id: If07e33b5639b2093f7fc0703c30a725fa40bea3a