fixes #861 Change-Id: Id7bf8ab28e92e6e509e47a65304058d77f4b261f (cherry picked from commit 7a28b972c0)
7a28b972c0