fixes #374 Change-Id: Ibfe89b7804183ef04eba39d29e01b70160f7c264 (cherry picked from commit 5bcbf27fe1)
5bcbf27fe1