Merge "Update test 044 for java-8" am: 0c306646ed am: f3054ae7cc
am: e8ff6b1eb8

Change-Id: I2fe6bb699aa9bd79e1e8469550c0d0951a7d702f