BD-1108:  after submodule init, sync to HEAD of master

Change-Id: I4245c68ec466d5c530bc33cb0da8d2b4825db1c6