Merge changes from topic "coverage_flush" am: 41cb9915b2
am: 9fcdb3edaf

Change-Id: I87d76100735dad338e5df31bc2e11325012da2db