Fixes for Comment#150 of Bug#879861

Change-Id: I6d9695ecb901cd2d9163a6f42e7241f0313864d4