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

Change-Id: I35c307b7917f1147f5aef5af81d1342c13e1bda6