Merge branch 'ewillink/582596'

Change-Id: I4729612ceb036c9bbc93d69d691bc4b5cd07d40e