Logical order of "from" and "to"

Change-Id: I2e1ec1100bbf4ba6fc00167da6c1693b2ec06b97
Merge "Logical order of "from" and "to""