Merge db2403ff from open-source master

Change-Id: I90dfa2f37db901b62690b6becbf5d0d91468672c