Added final changes

Change-Id: I304611bc05e8ccbfb83a28ed0289c6c044ba37a3
Closes-Bug: 1375299