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

Change-Id: I4e0c295c63b14984f5e1a8f1ef07abfda39ee360