Feb 19 updates

Change-Id: I09cb885b8c9667d4d76575dfd984eb066266ad0f