Add missed files to branch

Change-Id: If54184a64b1b79b83ad65de885f0468815124d76