Merge remote-tracking branch 'upstream/stacklight' into merge-branch

Change-Id: I1dda55c0317a4df6ffea1fa11d521941328fc1e6