Edit/update previous commit

- MRW36

Change-Id: I003728bddfc1dc2b6b84abaa8f8b5f2dba36c336