Merge changes from topic "health21" am: a1e654d8f1 am: 43952e9e56
am: 9c1328bb49

Change-Id: I3a89e4f49f246839a46aa7592b9fe57009160ee9