Merge changes from topic "fix_master_build" am: 2e5319117a am: 8125047183
am: 95cc083588

Change-Id: I3f5ec7c9b170e5f168a300a86364559ea88e0c93