Merge "update checkbox based on FAS API" into pi-dev
am: cff99cc2e3

Change-Id: I556fdf252bef54840dc9ec2fe4a43a991517cab2