Merge changes from topic "health21"
am: a1e654d8f1

Change-Id: I8e9cc9f96d21af8e673c2d9f5c612a524d4951e1