Missed out changes for the commit 9586925b328e66d70de0b5fce6dac3e1b68b24...

...92

Change-Id: Ic65206d12aeb4de3d04c7369cfee7c3933760821