[Merged from onos-1.0] Change-Id: I276454b09d32e1a7b7182271ddba8cf6add71c40 (cherry picked from commit e84ab32f84aea4a0604e8b15fd22e75f85aaa85b)