c309d3ab17
This commit fixes neutron core and common codes. Partial-Bug: #1279813 Change-Id: Id109924c7ff9b4f0d74c23665016a54bfd7dff77