Periodic merge to get master changes into nextgenv2. Change-Id: I6f0e4b470f193da03f1a8cb8e6a93ae39395699a