Merge changes from topic "libhealthloop" am: 9a41dd7f5a am: d902e230d9 am: 38b1a9f7bd
am: af15e50145

Change-Id: I76a218803b27dac9fad95b706d66a094c8105c3a