bug# 1198849 - from blallau

Change-Id: I40f9e01c89838d8b7efa05fe4d12c0bf340e5d4d
Merge "bug# 1198849 - from blallau"