Merge KeystoneQ-ww-20190522

Change-Id: I03b64105c115f2d90fb39cb9e620350458daeed0