Merge changes from topic 'am-c3adaa91d98f4ee1af0e84b694db5f41' into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Update current.txt to reflect result type change\" into nyc-mr1-dev am: 9e04446d
Update current.txt to reflect result type change am: 79621c94