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

Change-Id: I8dac2619a5a8e0b7900945e317e5c83385fb6f26