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

Change-Id: Ibbef3c623542ad7499ac18cf2ce8923b66a149b2