Closes-Bug: #1378084

Change-Id: I3c847022755f67c63f1f88948610f5f9199c15ba