Some additional useful steps

Change-Id: Iee0058f2f2d1abc19a5ae7dc8631a50c81778aaf
Merge "Some additional useful steps"