Closes-Bug: #1382729

Change-Id: I4cdbd2e238fb63f7418987cebc1fe4ad4064d0e3