(Update with the files left out from Change-Id: I15f83fc43d91c2c9d74b40fdcecdfe239242d565.)
Change-Id: I77e4f6105b1f5d4569ad59e3d536941310cc6c0d