Closes-bug: #1452047 Partially-fixes-bug: #1458979 Change-Id: I7e6bc61d8e004e22bb6df0400e78cb21b98b868f