Merge changes from topic 'bug_38177295_checkbuild'
am: bc8f82ff25

Change-Id: Id1ecb9598aa7ed3675d7d602821a1b9d376b627d