Merge changes from topic "libhealthloop"
am: 9a41dd7f5a

Change-Id: I2ad923552b5e899e1ebabe68103e1167ac1ccf90