Bug 1363162.Added a change #2  suggested after code review.

Change-Id: I8acf9b5598cc8f7ac3dbcdec59b7814bc77c680e