Merge "Rename test description" am: bb3fe2fc85
am: d23fc10137

Change-Id: Ia33dd3be333b88e7077e77ac22442dc6fe079472