Merge changes Ic4181fc8,Icffeed2e,I9fdba4a9
am: 54c0726220

Change-Id: I3a5a1a1ae0096eba2993798bf2707a8cfda81c97
tree: 5acbc25bebf94360d0b09c5318dc2cdcc4abacfb
  1. tests/