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

Change-Id: I07f171aa63d97debebfb0a7d86cd0ef53a986d29