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

Change-Id: I7709702e12d28e7403e134c9da65d8735e54dcf6