Closes-Bug: #1378084

Change-Id: I2f98dc830f6085e1896c300e8e1b1df9dbd7ee43