Due to some mismatch in applying patches, one patch was overriding the changes added by commit bd5c9fcbf79d326817312138cf03298adf09df27. This patch restores the changes. Change-Id: I43223f01653c53df00682e8489b89e8978989944 Signed-off-by: Rajeev Kulkarni <krajeev@codeaurora.org>