I20170222-2000
compiles with javac - replaced one unspeced tweak with a solution hinted at by Maurizio Change-Id: Ibd60aed3259981b99e5ec33b8090f97e75dc2aef
compiles with javac - replaced one unspeced tweak with a solution hinted at by Maurizio Change-Id: Ibd60aed3259981b99e5ec33b8090f97e75dc2aef