Merge changes from topic 'bug_38177295_checkbuild' am: bc8f82ff25
am: 0556ad1a71

Change-Id: Id348090022adb631a5cd8f568dbc38a4c8d4d550