Merge changes from topic "libhealthloop" am: 9a41dd7f5a
am: d902e230d9

Change-Id: I9d812b05d0493cce059d0b434aaabba5466b0404