Merge changes from topic "coverage_flush"
am: 41cb9915b2

Change-Id: I8da9aa6f78d7f30f4dbbb52a804058accfef6905