Fix to bug 3389385.

Change-Id: Ibf0d0ec3272c3b59fb20b837a739aaa99b1986b5
4 files changed