Let's apply the same for these

Change-Id: Icd0f4ecee7d3d633f7a41e479729688829b4cf9d