Merge changes from topic 'bug_38177295_checkbuild' am: bc8f82ff25 am: 0556ad1a71 am: 3dd019b9c4
am: 206b85e3b2

Change-Id: I9d1291610e5bd2d7a983d533e1c57627a9ab3bec