Let's keep things the same

Change-Id: I692dead93ce18c9d553f191b6a81c359f1b47b91
Merge "Let's keep things the same" into du44