Closes-bug: bug 1261737

Change-Id: Ibeeabeb3114800832cea875213d2e69fed4fe6d6
Merge "Closes-bug: bug 1261737"