Missing changes from the previous one.

Again, a part of PA's commit.

Change-Id: I7cc7a5db52b9d5b22e4620a89cda93d0a38ae17a