Merge commit 'eecfc2c5f7513c1d5f7eb352575f54c7d0a792b5' into manual_merge_eecfc2c5f7

Change-Id: Ic6dac401be7f823931954741fa8914986226eb1c
This commit is contained in:
Stefanot
2017-01-23 10:51:26 +00:00