Merge "Fix regression on Ryu device" into oc-mr1-dev
am: 57198dd2ac

Change-Id: I2ae6897670368c0f23c56921e4a47389cd81ca02