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

Change-Id: I4abdcf45109efd4baa2181da126836fecd758daa