am d31aa4e2: am e653ed26: Merge "Updating Email checkboxes with framework assets" into honeycomb

* commit 'd31aa4e2a940e21964dbdbf9653709e988fe3a90':
  Updating Email checkboxes with framework assets