Merge "Store parameter object's intent field to local var" into cw-f-dev am: 4f948d7ef9
am: 1ba8b42967

Change-Id: I3fe349db3aeae670fd09d55739bc5db52b5ae867